204. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2023-03-13 03:01:05 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

204.1 Files compared

#LocationFileLast Modified
1Porto v4.0.4/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/templates/cartminicart.phtml2021-06-24 08:53:08 +0000
2Porto v4.0.5/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/templates/cartminicart.phtml2023-02-15 03:33:41 +0000

204.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged5140
Changed37
Inserted13
Removed00

204.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

204.4 Active regular expressions

No regular expressions were active.

204.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright © 2015 Magento. All rights reserved. 3  * Copyright © 2015 Magento. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6  6 
7 // @codingStandardsIgnoreFile 7 // @codingStandardsIgnoreFile
8  8 
9 /** @var $block \Magento\Checkout\Block\Cart\Sidebar */ 9 /** @var $block \Magento\Checkout\Block\Cart\Sidebar */
10 $_portohelper = $this->helper('Smartwave\Porto\Helper\Data'); 10 $_portohelper = $this->helper('Smartwave\Porto\Helper\Data');
11 $cart_design = $_portohelper->getConfig('porto_design/header/header_minicart_design')
;
 11 $cart_design = $_portohelper->getConfig('porto_design/header/header_minicart_design')?$_portohelper->getConfig('porto_design/header/header_minicart_design'):'1';
    12 $popup_design = $_portohelper->getConfig('porto_design/header/header_minicart_popup_design')?$_portohelper->getConfig('porto_design/header/header_minicart_popup_design'):'1';
12 ?> 13 ?>
13  14 
14 <div data-block="minicart" class="minicart-wrapper cart-design-<?php echo $cart_design ? $cart_design: '1'?>
">
 15 <div data-block="minicart" class="minicart-wrapper cart-design-<?php echo $cart_design ? $cart_design: '1'?><?php if($popup_design == '2'):?> minicart-offcanvas<?php endif;?>">
15     <a class="action showcart" href="<?php echo $block->getShoppingCartUrl(); ?>" 16     <a class="action showcart" href="<?php echo $block->getShoppingCartUrl(); ?>"
16        data-bind="scope: 'minicart_content'"> 17        data-bind="scope: 'minicart_content'">
17        <i class="minicart-icon porto-icon-shopping-cart"></i> 18        <i class="minicart-icon porto-icon-shopping-cart"></i>
18         <span class="text"><?php echo __('Cart'); ?></span> 19         <span class="text"><?php echo __('Cart'); ?></span>
19         <span class="counter qty empty" 20         <span class="counter qty empty"
20               data-bind="css: { empty: !!getCartParam('summary_count') == false }, blockLoader: isLoading"> 21               data-bind="css: { empty: !!getCartParam('summary_count') == false }, blockLoader: isLoading">
21             <span class="counter-number"> 22             <span class="counter-number">
22             <!-- ko if: getCartParam('summary_count') --><!-- ko text: getCartParam('summary_count') --><!-- /ko --><!-- /ko --> 23             <!-- ko if: getCartParam('summary_count') --><!-- ko text: getCartParam('summary_count') --><!-- /ko --><!-- /ko -->
23             <!-- ko ifnot: getCartParam('summary_count') -->0<!-- /ko --> 24             <!-- ko ifnot: getCartParam('summary_count') -->0<!-- /ko -->
24             </span> 25             </span>
25             <span class="counter-label"> 26             <span class="counter-label">
26                 <!-- ko i18n: 'items' --><!-- /ko --> 27                 <!-- ko i18n: 'items' --><!-- /ko -->
27             </span> 28             </span>
28         </span> 29         </span>
29     </a> 30     </a>
30     <a class="showcart action-subtotal d-none" href="<?php echo $block->getShoppingCartUrl(); ?>" 31     <a class="showcart action-subtotal d-none" href="<?php echo $block->getShoppingCartUrl(); ?>"
31        data-bind="scope: 'minicart_content'"> 32        data-bind="scope: 'minicart_content'">
32         <span class="cart-subtotal"> 33         <span class="cart-subtotal">
33           <?php echo __('Shopping Cart'); ?> 34           <?php echo __('Shopping Cart'); ?>
34           <span class="cart-price"> 35           <span class="cart-price">
35             <span class="amount" data-bind="html: getCartParam('subtotal_excl_tax')"> 36             <span class="amount" data-bind="html: getCartParam('subtotal_excl_tax')">
36               <!-- ko if: !getCartParam('subtotal_excl_tax') --> 37               <!-- ko if: !getCartParam('subtotal_excl_tax') -->
37                   <!-- ko i18n: '€ 0.00' --><!-- /ko --> 38                   <!-- ko i18n: '€ 0.00' --><!-- /ko -->
38               <!-- /ko --> 39               <!-- /ko -->
39             </span> 40             </span>
40           </span> 41           </span>
41         </span> 42         </span>
42     </a> 43     </a>
43     <?php if ($block->getIsNeedToDisplaySideBar()): ?> 44     <?php if ($block->getIsNeedToDisplaySideBar()): ?>
44         <div class="block block-minicart empty" 45         <div class="block block-minicart empty"
45              data-role="dropdownDialog" 46              data-role="dropdownDialog"
46              data-mage-init='{"dropdownDialog":{ 47              data-mage-init='{"dropdownDialog":{
47                 "appendTo":"[data-block=minicart]", 48                 "appendTo":"[data-block=minicart]",
48                 "triggerTarget":".showcart", 49                 "triggerTarget":".showcart",
49                 "timeout": "2000", 50                 "timeout": "2000",
50                 "closeOnMouseLeave": false, 51                 "closeOnMouseLeave": false,
51                 "closeOnEscape": true, 52                 "closeOnEscape": true,
52                 "triggerClass":"active", 53                 "triggerClass":"active",
53                 "parentClass":"active", 54                 "parentClass":"active",
54                 "buttons":[]}}'> 55                 "buttons":[]}}'>
55             <div id="minicart-content-wrapper" data-bind="scope: 'minicart_content'"> 56             <div id="minicart-content-wrapper" data-bind="scope: 'minicart_content'">
56                 <!-- ko template: getTemplate() --><!-- /ko --> 57                 <!-- ko template: getTemplate() --><!-- /ko -->
57             </div> 58             </div>
58         </div> 59         </div>
59     <?php endif ?> 60     <?php endif ?>
60     <script> 61     <script>
61         window.checkout = <?php echo \Zend_Json::encode($block->getConfig()); ?>; 62         window.checkout = <?php echo \Zend_Json::encode($block->getConfig()); ?>;
62     </script> 63     </script>
63     <script type="text/x-magento-init"> 64     <script type="text/x-magento-init">
64     { 65     {
65         "[data-block='minicart']": { 66         "[data-block='minicart']": {
66             "Magento_Ui/js/core/app": <?php echo $block->getJsLayout();?>
 67             "Magento_Ui/js/core/app": <?php echo $block->getJsLayout();?><?php if($popup_design == '2'):?>, "Magento_Checkout/js/catalog-add-to-cart-mixin": {}<?php endif;?>
67         }, 68         },
68         "*": { 69         "*": {
69             "Magento_Ui/js/block-loader": "<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>" 70             "Magento_Ui/js/block-loader": "<?php echo $block->getViewFileUrl('images/loader-1.gif'); ?>"
70         } 71         }
71     } 72     }
72     </script> 73     </script>
    74     <?php if($popup_design == '2'):?>
    75     <div class="minicart-overlay"><svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><defs><style>.minicart-svg{fill:none;stroke:#fff;stroke-linecap:round;stroke-linejoin:round;stroke-width:2px;}</style></defs><g id="cross"><line class="minicart-svg" x1="7" x2="25" y1="7" y2="25"></line><line class="minicart-svg" x1="7" x2="25" y1="25" y2="7"></line></g></svg></div>
    76   <?php endif;?>
73 </div> 77 </div>